From 3b61bd783aaf458ecbffac2bd556e3f33a631419 Mon Sep 17 00:00:00 2001 From: "atse@norwich.uk.xensource.com" Date: Fri, 22 Sep 2006 16:32:30 +0100 Subject: [PATCH] [XM] Move 'xm sysrq' into main.py * There's not need for sysrq to be in its own file. * Bonus advantage: can use arg_check rather than gopts for argument validation. Signed-off-by: Alastair Tse --- tools/python/xen/xm/main.py | 8 +++++++- tools/python/xen/xm/sysrq.py | 30 ------------------------------ 2 files changed, 7 insertions(+), 31 deletions(-) delete mode 100644 tools/python/xen/xm/sysrq.py diff --git a/tools/python/xen/xm/main.py b/tools/python/xen/xm/main.py index 2bf6f80aeb..24e165ac66 100644 --- a/tools/python/xen/xm/main.py +++ b/tools/python/xen/xm/main.py @@ -1010,6 +1010,12 @@ def xm_uptime(args): print upstring +def xm_sysrq(args): + arg_check(args, "sysrq", 2) + dom = args[0] + req = args[1] + server.xend.domain.send_sysrq(dom, req) + def xm_top(args): arg_check(args, "top", 0) @@ -1318,6 +1324,7 @@ commands = { "restore": xm_restore, "save": xm_save, "shutdown": xm_shutdown, + "sysrq": xm_sysrq, "uptime": xm_uptime, "list": xm_list, # memory commands @@ -1359,7 +1366,6 @@ commands = { IMPORTED_COMMANDS = [ 'create', 'migrate', - 'sysrq', 'labels', 'addlabel', 'cfgbootpolicy', diff --git a/tools/python/xen/xm/sysrq.py b/tools/python/xen/xm/sysrq.py deleted file mode 100644 index d17596f707..0000000000 --- a/tools/python/xen/xm/sysrq.py +++ /dev/null @@ -1,30 +0,0 @@ -# (C) Matthew Bloch 2004 -# Copyright (C) 2005 XenSource Ltd - -"""Domain sysrq. -""" - -from xen.xend.XendClient import server -from xen.xm.opts import * - -gopts = Opts(use="""[DOM] [letter] - -Sends a Linux sysrq to a domain. -""") - -gopts.opt('help', short='h', - fn=set_true, default=0, - use="Print this help.") - -def main(argv): - opts = gopts - args = opts.parse(argv) - - if len(args) < 1: - raise OptionError('Missing domain argument') - if len(args) < 2: - raise OptionError('Missing sysrq character') - - dom = args[0] - req = ord(args[1][0]) - server.xend.domain.send_sysrq(dom, req) -- 2.30.2